rearrange directory structure

(thanks eclipse...)