reorganize file structures; allow for module-specific types