added version and changed up organizaton