Organize code, simplify and remove unused classes

Testing some js interaction