Changed file names and added some basic formatting
Merge branch 'master' into usersToDatabase