changed folder structure

changed folder structure in preperation of branches