Moved webapp and services in distinct folders