remaned class folder and added namespaces