Rearrange directory structure for maven