fix and refactor project configuration