Restructured projects as discussed with current build failure for web pr...

...oject due surefire plugin.