Cleaned up project and scheme_setup.sql