Updated definitions, moved assets to web directory instead of app directory. New upload directory in web/assets