Add spec directory, remove test directory