Fixed Merge
Flattedend the stucture a bit