Changed file structure

Aligned tab size and indentation