Enhance structure
 * remove transition file
 * add basic functions