Revert "Changed file names and locations of several data type files for better organization"

This reverts commit 2b02663d29f9956cf2f10b4d2e21700a0763ad92.
Revert "Revert "Changed file names and locations of several data type files for better organization""

This reverts commit 94afafd43649815abaf077413b8f9889d6607d86.