Some changes
Database refactored, project in mess