prettier json output
moved module to subfolder
easier access to units