Added some utility scripts and reorganize files