Adding initial file organization