package organization edited
WMS more generic
made more generic + new classes