sorting out folder structures, updating build file