rearrange project structure