Remove extra files, clean up directory structure