Typo
Reorganized directory structure
Readme update