commit 7: rearrange project