Revert "Development V1.0 commit"

This reverts commit a8ebc1a1a5bc7175d6bfe76e7b24b20aa236792b.
Commit - refactor finish