renamed collector classes
added init file