Classes moved to outer fle