code cleanup
rename data and bindings files