moved a few files around

Also corrected a few items in db creation sql