Fix file structure and class naming
convention.