Some quick file organizing.

I hope it worked!
Revert "Some quick file organizing."

This reverts commit da8206dfeaca825e08db92665066e01c94715cfe.