#16 project structure reorderd