reorganized directory structure for project