Removed dumb whitespace option + no tabs
Moved files to make it more readable