re-structure layout of project