moved some files around, minor syntax fixes