Fix indents & organize imports (res & src)
Merge pull request #194 from ratan12/Fix_indentations

Fix indents & organize imports (res & src)