Fixed install issue and update the directory structure.