update

updated the classes to be used in other projects