moved some files around to conform to style