file restructure
merge conflicts resolved - colleen