-- changed structure and layout of presentation.
-- clean up to sperated files.