updated readme and cleaned up dir structure