Reorganization and updated README file