refactoring to a right project folder and more changes