Create single signal table + Refactor
Fix code layout