Organization and Updates

Herein are changes and updating (organizing) of V1 and V2.