- changed folder layout to be in line with solution