internal reorganization and readme update