updated to be a normal webapp structure