Fixing up directory structure into a more sensible one