Some renames and removal of unnecessary garbage