Holy re-organization Batman!