restructuring the jpts module