Latest lcore version and slight restructuring