major refactor of dir structure