Added more classes
Added more config files