change: reorganize the folder structure