Mega commit

Reshuffling + CRLF->LF + cleanups