Added more classes. Edited ModuleFly a bit.