Apply some PCF to classes
Move some methods where they belong