Revamped project structure.