Added support for more flexible input regarding project folder, project file