Fixed built errors
Reorganized database model
added database file