Revert "Organized files"

This reverts commit 29abf405a8c01a28fe5ffac5bb414983aba82107.