Revert "Organizing files"

This reverts commit e5d7e2bb4a607843f322b3f3ca6db0a14fa77242.