Fix: Move class into src/
#581
+8
−6
Merged
src/
#581