Refactor naming and folder structure.