added Context Classes and autoloading