file and folder slight restructure