Restructured the project filesystem