Cleanup of directory structure, splitting out things nicely