Changed Project structure