Restructure files
Use two spaces for indentation
Refactor code