Loader is more intuitive
Old directory has been removed