Removed unused files in build directory.
Reorganized segments.