Moved mainBundle to Application