Fixed database problems
Removed folder structure from gradle (causing problems)