fload bug fix and update folder structure