fixed versioning and extras reorganization