removing database moving to own folder, refactoring