refactor some parts to paths
add final class to mark objects which have been refactored, comment out style be default, to be removed when refactoring complete