Reorganization, updated readme's, prepared for OPPM