Put classes in separate file, added cleaning / analysis scripts