Reorganization

Also fixed version to 1.0.