fixing a bug related to callback
moved core files to vendor folders
removed vendor versioning from names in order to allow greater flexibility on vendor updates