Remove old unused classes and add new to be used classes.
Update annotation for Publish class
revert to older urls