Moved to subdirectory and namespace package