Fix project structure to align with folders

Closes #5