rearranging directory structure to be more sensible