#126 dropped modules from project structure for now