Restructure directories and add test data