put classes in namespace, changed initial constructor