Changed project structure, finished saving to db methods