added more unit conversions

also changed package folder so development mode works properly