Project structure updates
Updates to structre