Reorganize into two dirs, pi coming soon