unmerged
mogami: Repartition internal storage - thanks to Mike