[1.5.1] Refactor: added a file (PG*, JL*)