Close #182 Reorganize code into file per type