More consistent naming of methods.

Also remove unused methods
fixed tests
Not needed anymore
Clean-up in resources folder