Usage folder restructure and tidy up