changed folder structure to make more sense