Re-organize folders so that it's more sane.