change project structure
better configuration