Revert "better organizing the files"

This reverts commit 561ed964e063dc7361f40834d35cf2210b539bdc.