make code looks comfortable
rename surface holder name
fix entry class
remove non-track files