Move things around to conform to typical ruby project structure