Flattened folder structure - removed solution folder