Move things around to conform to package dev conventions