Move classes to their own files
Code cleanup
Make use of Forwardable