Restructure (create lib, test directories)