Updated Folders for lib and test