Changes due to my own project structure