Moving around .inc files, organizing and grouping