refactor partition, swap and disk rcs