Fix indents & rearrange (res & src)