Added subdirectories, fixed Readme