Add lib and test folders