restructured folder organization, also updating remote repo with long list of local changes