Code layout changed. Minor changes in build system.