Moved some files around to be more gem-like