Updated project structure + fresh checkout from prod server