Fixing namespace, moving Helper to proper src folder