Moved things to a more standard gem structure