Rearranged files and folders to make the architecture more flexible.