Revert "Moved files inside webapp folder"

This reverts commit a6cb5954ab1bf65db8a1f882ea2aaa306b07f6b6.
fixed problems