updated file organization