Re-organization + introduction of Entities + Configuration "management" (in progress)