Minor fixes.
Changed project hierarchy.