Still seeing the no class def found error.
Moved files to a dynamic web project.
fixed merge conflicts.
Finished porting to a dynamic web project.