Refactoring/renaming to sample-portal1