Second part of file re-org