Did folder seperation, including schema files