Finished re-organization