(#52) Reorganize files.
(#52) cleanup