Added namespace and cleaned files