Modified project structure
Not tested yet