Split to modules; update skel