Moving common code/libs into root directory