Move classes into subpackages
Make reflections static