Revise project structure and name