Added sources lyra and norh, restructured code