[S2FS] Merge Controller into CoreBundle