Moved extension classes to new folder