Remove needless files and some name changes