Rearrange Project structure