Updates to Imports and DataCollector so they are more rsensy
Added all new files