Organize, update ports, fix fe logic