major files/folders re-org