Changed way classes were added + xml changes

Changed way classes were added + xml changes