reorg code in previous
Merge branch 'ChocoButter-2Become1' of github.com:DynamoDs/Dynamo into ChocoButter-2Become1