Finished refactoring, putting the project on pause indefinitely