moved some files around, fixes