Classes moved from dev locations