Code cleanup
Also added web-root folder for static files