Moved source for workflow to other directory and few other improvements