Fix project structure. Naming was bad.