enhance project structure couple of items