Restructuring, all inputs/receivers now belong int the /modules/ package, allows more logical combining of functionality etc.