Renamed stuff, made admin to work, added database
rm-ed whitespace