Revert "Moved files into a more pythonic order."

This reverts commit f1e0f0033158565d62dc131d92b04120af4ceb2b.