Rearranged project packages