Reorganizd

Includes all versions and variants in development