Facorting out some modules, some re-ordering of things and added WorkShopList