better file organization

[icd2k3]

No description provided.

[coveralls]

Coverage remained the same at 100.0% when pulling 6e856b9 on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage remained the same at 100.0% when pulling e06463a on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage remained the same at 100.0% when pulling 52664ec on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage decreased (-0.1%) to 99.857% when pulling 66cf8c3 on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage decreased (-0.1%) to 99.857% when pulling 66cf8c3 on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage decreased (-0.1%) to 99.859% when pulling e7d2f86 on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage decreased (-0.1%) to 99.859% when pulling 2b3daeb on cleanup_reorg into 0068d5f on master.

[coveralls]

Coverage remained the same at 100.0% when pulling 1805a73 on cleanup_reorg into 0068d5f on master.