refactor: namespaces and folders
naming convetions