refactored the database schema to better fit the OSEO data model