Development Simplification

A Cleaner Structure with less development code for distribution.