exception handling and folder restructure