Updated ptrans definitions
Minor refactoring and name/dir reorganization