beginning to restructure the project in classes