restructure and added some analysis tools