Removing useless classes, reorganization of cfg files