Monday work and file restructure