Moving all classes back into a single namespace