Disentangled main packages, repacked project to 'flatten' it out, added 'lang' package