Rearrange project a bit
Fix #6