Removed helpers and namespace packages

It works.