[BUGFIX] Removes Classes out of namespace

Change-Id: Iefdaee677f1bd3db7e8b350d65657b2908a30010