Changed directory structure. Flat is better than nested.