Changed structure and added lib/lang and lib/log