Juggled things around a bit for a cleaner file system and a valid gem
file layout.