move main app stuff to webapp/
ugh