moved files around, fixed project settings