Reorganization

Still feeling out crate layouts...