Last major commit of V1

Better organization, big code additions and modifications