Updated Project structure