Added / reorganized stuff in PSware / Event processing