rearranged files, dtype conversions for speed
No longer using float32; minimal speedup