Added namespace aware interface
Updated directory seperators