Restructured and added support for --path parameter