Moving everything to its corresponding namespace