Reorganized project structure.
One last tweak to build scripts.