bug fix and change path and structure