Add select P2L operations, reorganize