Include packages diretory and corrected naming