Rename, reorganize and add license
Whitespace cleanup