Reorganizing: moved custom classes to separate files