Revert "Organized files"

This reverts commit dfdcfdf0dec4f3b10e3611ba832256c26a6bfff6.