simplify project structure

collapse folder and replace generic name