Refactor code. Clean up method names, imports, and folder structure.

[jtmichelson]

Just some cleaning. Functionality remains the same.

[github-actions[bot]]

Test Results

0 tests  ±0   0 :heavy_check_mark: ±0   0s :stopwatch: ±0s 1 suites ±0   0 :zzz: ±0  1 files   ±0   0 :x: ±0 

Results for commit c699368b. ± Comparison against base commit fb1f269f.