refactor : file layout