Add library and test directories