Reorg/Rename files, simplify TypeSharp attribute