Deleted some useless shit and renamed some shit