changing the project structure, its shit now