changed folder structure to conform to mvc pattern