Reorganization, updated README