Reorder files
Add build script
Some minor revisions