Refactor file structure/namespace