move macros in separate classes and extend them (cleaner source files)
add updated js files