changed folder structure to work with apollo