Moved Class into namespaced dir