Added controller jars and reorganized input classes