Add main and test directory