re-organized directory, updated README