Minor restructure

Moved some files closer up to make the versioning more simplified.