Renamed classes and project to better suit purposes