changes to allow for relative paths and including namespace