Added lib and test directories