project structure reorgonized