Move all flask/bottle into glassware
Move wfg one directory level up