Moved to folder following the namespace