Fix indents & organize imports (res & src)

Fix indents & organize imports (res & src)