rearranging directory structure
cleanup;rearranging