moved classes into proper folder and namespaces