Removed unnecessary files and renamed some classes.