Moving everything else into separate packages