Fixes and relevant folder structure for portals