Refactoring to project with subdirs template