Feature/package cleanup

see details for commands on https://github.com/jluyke/Windmills/commit/495fc58326adcca4049ef6f4cf2d961d8212a476