Moved stuff to src/mainwebapp & src/main/java