[Refactoring] status quo estabilish with new file structure