Refactoring
Fixing lua reference
Adjusting to new interfaces to create JSONs
Improving readbility of classes names