committing folder restructure