Refactoring and option to open only project directory