Adjust Project structure