Fixed directory structure and cleaned things up