Move code back out of subfolder for direct git cloning as library