Whitespace
Put files in correct place
Consistent module indentation, update require paths