Refactoring, add data files and added analysis module