Clean up directory structure, static methods #10
Description
Organise the classes and methods better. The "utils" folder is too big and some things there don't belong there. Also we should avoid writing closures directly into the methods, they should be extracted as methods or final fields of the class.