Removed confusing CollectorInput trait
Restructuring