Reorganized structure
Fixed assembly version
Git merged with upstream