Bring features/neutron into the same parent dir as everything else