Changed files names and corrected namespace issue.