Small restructure
Added missing file