changed file structure a little, updated .gitignore file, done some more SQL work