Cleaning up directory structure