rename class name
adding remotemaker
merge
refactor