moved controller core classes to an enclosed package