mass refactorage
refactoring base to Base