Adjusted project structure and configurations to keep it work.