Update Project

Cleaned project, removed useless code, created two new classes.