Updated documentation & improved methods
Added namespace core & moved to core classes