Refactor project structure and remove bak files