Class and namespace reshuffle