refactor project folder and naming