Ogranize into web-app and web-service subdirectories