Rearrange project structure