Changed directory structure and update readme