Rearrange project structure for easier CI builds