rearrange directory structure to solve build issues