Moved classes outside run file