Classes extracted to separated files