refactor dir structure for etl classes